From 1b05004ba2960f345a173db5ab9225b65993a7ab Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 27 Aug 2012 16:47:58 +0000 Subject: [PATCH] debian-debug Gbp-Pq: Name debian-debug.diff --- configure.in | Bin 412326 -> 412491 bytes solenv/gbuild/platform/com_GCC_defs.mk | 4 ++++ solenv/gbuild/platform/unxgcc.mk | 5 +++++ solenv/inc/unxgcc.mk | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/configure.in b/configure.in index 5d6e8b54b0d4cc78e3be8f0f64078cc3c2e39ffa..cde5d98b000b13098496668847aed81778e11d30 100644 GIT binary patch delta 168 zcmZ2BRr2&S$%ZYAOn0VF=wsrVUa!T%9$H+Po0OkZtfXM8pcL%u=;NcLpqsCtq>`GK zn3R(mk1SoBo0yZMWUWw=k($S)00yppj!r(V@xhV4PX0c@wonterhoj-D8&I*uaKWN w-7tbtWIEFwMycsXO-O>)^($%ZYAOn0WwyTd3oeeP98{^<=}Ed1^F?=S)}6A&{4G0XP*cUW`s03xOr AJ^%m! diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 60ae0c355f3..c2dad502790 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -127,7 +127,11 @@ ifeq ($(HAVE_GCC_FNO_DEFAULT_INLINE),TRUE) FNO_DEFAULT_INLINE=-fno-default-inline endif +ifeq ($(ENABLE_SYMBOLS),SMALL) +gb_DEBUG_CFLAGS := -g1 $(FINLINE_LIMIT0) $(FNO_INLINE) +else gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE) +endif gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9a232e20f33..0f8a7b7c3e6 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -194,9 +194,14 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) ifeq ($(gb_SYMBOL),$(true)) +ifeq ($(ENABLE_SYMBOLS),SMALL) +gb_LinkTarget_CXXFLAGS += -g1 +gb_LinkTarget_CFLAGS += -g1 +else gb_LinkTarget_CXXFLAGS += $(GGDB2) gb_LinkTarget_CFLAGS += $(GGDB2) endif +endif # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10 # we want to use @$(extraobjectlist) in the long run diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 0d4cf9de788..0a0b6182fd3 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -77,7 +77,11 @@ CC+:=$(CFLAGS_SYSBASE) CFLAGS+=-fmessage-length=0 -c # flags to enable build with symbols +.IF "$(ENABLE_SYMBOLS)" == "SMALL" +CFLAGSENABLESYMBOLS=-g1 +.ELSE CFLAGSENABLESYMBOLS=-g +.ENDIF # flags for the C++ Compiler CFLAGSCC= -pipe $(ARCH_FLAGS) @@ -119,7 +123,11 @@ CFLAGSSLOCUIMT=$(PICSWITCH) # Compiler flags for profiling CFLAGSPROF= # Compiler flags for debugging +.IF "$(ENABLE_SYMBOLS)"=="SMALL" +CFLAGSDEBUG=-g1 +.ELSE CFLAGSDEBUG=-g +.ENDIF CFLAGSDBGUTIL= GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk -- 2.30.2